From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 31 Dec 2008 07:14:29 +0000 (+0100)
Subject: Merge branch 'linus' into tracing/kmemtrace
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~22380^2~395^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5fdf7e5975a0b0f6a0370655612c5dca3fd6311b;p=linux-4.9.git

Merge branch 'linus' into tracing/kmemtrace

Conflicts:
	mm/slub.c
---

5fdf7e5975a0b0f6a0370655612c5dca3fd6311b